Merge tag 'upstream/3.001.002'
authorgregor herrmann <gregoa@debian.org>
Mon, 14 Jul 2014 15:05:37 +0000 (17:05 +0200)
committergregor herrmann <gregoa@debian.org>
Mon, 14 Jul 2014 15:05:37 +0000 (17:05 +0200)
commitce2e163f2f13072add0e922a1d0714b5d44fee7c
treeba10700c20aa89b38b5f900a09038101e2d3ec4c
parent2972a2fb35fc5f73a8b6fe92d99aca7556399ccb
parent622cc6d8154fb8ac77ca024c96a8d64db42678db
Merge tag 'upstream/3.001.002'

Upstream version 3.001.002